Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <[email protected]>
Sun, 17 Jan 2010 22:08:42 +0000 (23:08 +0100)
committerWolfgang Denk <[email protected]>
Sun, 17 Jan 2010 22:08:42 +0000 (23:08 +0100)

Trivial merge